Use 'cannot' instead of 'can not' in messages. (#144226, Morten Welinder)

Thu Jul 15 19:20:05 2004  Matthias Clasen  <maclas@gmx.de>

	* gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale):
	* gtk/gtkcalendar.c (gtk_calendar_class_init): Use 'cannot'
	instead of 'can not' in messages.  (#144226, Morten Welinder)

diff --git a/ChangeLog b/ChangeLog
index e9137f9ec97d75731ec43a8d92c2a0239becdf87..e041a280f0f6725c207083d6eb749644e80afefe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jul 15 19:20:05 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale): 
+       * gtk/gtkcalendar.c (gtk_calendar_class_init): Use 'cannot'
+       instead of 'can not' in messages.  (#144226, Morten Welinder)
+
 2004-07-15  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_class_init): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e9137f9ec97d75731ec43a8d92c2a0239becdf87..e041a280f0f6725c207083d6eb749644e80afefe 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Jul 15 19:20:05 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale): 
+       * gtk/gtkcalendar.c (gtk_calendar_class_init): Use 'cannot'
+       instead of 'can not' in messages.  (#144226, Morten Welinder)
+
 2004-07-15  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_class_init): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e9137f9ec97d75731ec43a8d92c2a0239becdf87..e041a280f0f6725c207083d6eb749644e80afefe 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Jul 15 19:20:05 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale): 
+       * gtk/gtkcalendar.c (gtk_calendar_class_init): Use 'cannot'
+       instead of 'can not' in messages.  (#144226, Morten Welinder)
+
 2004-07-15  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_class_init): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e9137f9ec97d75731ec43a8d92c2a0239becdf87..e041a280f0f6725c207083d6eb749644e80afefe 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Jul 15 19:20:05 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale): 
+       * gtk/gtkcalendar.c (gtk_calendar_class_init): Use 'cannot'
+       instead of 'can not' in messages.  (#144226, Morten Welinder)
+
 2004-07-15  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_class_init): 

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 8c2915aedee740f0f6cebb5490d035dd00bb7540..46ac7e4dabb1a39923942a0cad5fd273f8338662 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jul 15 19:19:21 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * io-png.c (real_save_png): 
+       * gdk-pixbuf-io.c (gdk_pixbuf_io_init): Use 'cannot' instead
+       of 'can not' in messages.   (#144226, Morten Welinder)
+
 Fri Jul  9 15:38:06 2004  Manish Singh  <yosh@gimp.org>
 
        * gdk-pixbuf-io.c (gdk_pixbuf_format_set_disabled): function doesn't

diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index 809df09ebb75b4e2321dfa183c5e702e85a4d911..984acebc2da27ef946d44af2546af3383ef51e01 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -251,7 +251,7 @@ gdk_pixbuf_io_init ()
 
        channel = g_io_channel_new_file (filename, "r",  &error);
        if (!channel) {
-               g_warning ("Can not open pixbuf loader module file '%s': %s",
+               g_warning ("Cannot open pixbuf loader module file '%s': %s",
                           filename, error->message);
                return;
        }

diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
index df5417db3011fc09cdef1178685c67d6afe48b39..3d4501fa22a5b248de689fe9699f7e88a4030ff8 100644 (file)
--- a/gdk-pixbuf/io-png.c
+++ b/gdk-pixbuf/io-png.c
@@ -851,7 +851,7 @@ static gboolean real_save_png (GdkPixbuf        *pixbuf,
                                g_set_error (error,
                                             GDK_PIXBUF_ERROR,
                                             GDK_PIXBUF_ERROR_BAD_OPTION,
-                                            _("Value for PNG text chunk %s can not be converted to ISO-8859-1 encoding."), keys[i] + 6);
+                                            _("Value for PNG text chunk %s cannot be converted to ISO-8859-1 encoding."), keys[i] + 6);
                                num_keys = i;
                                for (i = 0; i < num_keys; i++)
                                        g_free (text_ptr[i].text);

diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c
index bbcd39bebc64156c3e3330c29112ef57dd2c4319..868fab0eec793f24a6a7bdff89a6fab26a2eb64a 100644 (file)
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@@ -65,7 +65,7 @@ _gdk_x11_initialize_locale (void)
     g_warning ("locale not supported by Xlib");
   
   if (!XSetLocaleModifiers (""))
-    g_warning ("can not set locale modifiers");
+    g_warning ("cannot set locale modifiers");
 
   if ((strcmp (current_locale, "C")) && (strcmp (current_locale, "POSIX")))
     {

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index e0fdef80fdd146e23ad9beb59e8c033be8bd4b9f..46df1806566e6882738237f9c3a2bc1ced03bb9c 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -523,7 +523,7 @@ gtk_calendar_class_init (GtkCalendarClass *class)
                                    PROP_NO_MONTH_CHANGE,
                                    g_param_spec_boolean ("no_month_change",
                                                         P_("No Month Change"),
-                                                        P_("If TRUE, the selected month can not be changed"),
+                                                        P_("If TRUE, the selected month cannot be changed"),
                                                         FALSE,
                                                         G_PARAM_READWRITE));